[IA64] linux: macro clean up

remove bogus macro usage in asm-ia64/hypercall.h

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>

diff --git a/linux-2.6-xen-sparse/include/asm-ia64/hypercall.h b/linux-2.6-xen-sparse/include/asm-ia64/hypercall.h
index 524559d3f9705f6af8ab039ab053209ec529db3c..c30d5c0d10d10d0ebc07eadb4f17aab79583202a 100644 (file)
--- a/linux-2.6-xen-sparse/include/asm-ia64/hypercall.h
+++ b/linux-2.6-xen-sparse/include/asm-ia64/hypercall.h
@@ -478,12 +478,12 @@ HYPERVISOR_add_physmap(unsigned long gpfn, unsigned long mfn,
        return ret;
 }
 #else
-#define HYPERVISOR_ioremap(ioaddr, size)               ({ioaddr;})
-#define HYPERVISOR_phystomach(gpfn)                    ({gpfn;})
-#define HYPERVISOR_machtophys(mfn)                     ({mfn;})
+#define HYPERVISOR_ioremap(ioaddr, size)               (ioaddr)
+#define HYPERVISOR_phystomach(gpfn)                    (gpfn)
+#define HYPERVISOR_machtophys(mfn)                     (mfn)
 #define HYPERVISOR_populate_physmap(gpfn, extent_order, address_bits) \
-                                                       ({0;})
-#define HYPERVISOR_zap_physmap(gpfn, extent_order)     ({0;})
-#define HYPERVISOR_add_physmap(gpfn, mfn, flags)       ({0;})
+                                                       (0)
+#define HYPERVISOR_zap_physmap(gpfn, extent_order)     (0)
+#define HYPERVISOR_add_physmap(gpfn, mfn, flags)       (0)
 #endif
 #endif /* __HYPERCALL_H__ */

diff --git a/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h b/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h
index 208c392fccdd06d638673565d186d5a172264cd6..7da96af58ce2e830845114abc699e7f056dc6d41 100644 (file)
--- a/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h
+++ b/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h
@@ -162,7 +162,7 @@ xen_destroy_contiguous_region(unsigned long vstart, unsigned int order)
                __xen_destroy_contiguous_region(vstart, order);
 }
 #else
-#define xen_create_contiguous_region(vstart, order, address_bits)      ({0;})
+#define xen_create_contiguous_region(vstart, order, address_bits)      (0)
 #define xen_destroy_contiguous_region(vstart, order)   do {} while (0)
 #endif
 

diff --git a/linux-2.6-xen-sparse/include/asm-ia64/page.h b/linux-2.6-xen-sparse/include/asm-ia64/page.h
index 640c6190e330efcb02fb58625dbb6800b961ad61..c791541c7f288a29d8332f849b1fec498c5e5e97 100644 (file)
--- a/linux-2.6-xen-sparse/include/asm-ia64/page.h
+++ b/linux-2.6-xen-sparse/include/asm-ia64/page.h
@@ -279,11 +279,11 @@ machine_to_phys_for_dma(unsigned long machine)
 #define set_phys_to_machine(pfn, mfn) do { } while (0)
 #define xen_machphys_update(mfn, pfn) do { } while (0)
 
-#define mfn_to_pfn(mfn)                        ({(mfn);})
-#define mfn_to_virt(mfn)               ({__va((mfn) << PAGE_SHIFT);})
-#define pfn_to_mfn(pfn)                        ({(pfn);})
-#define virt_to_mfn(virt)              ({__pa(virt) >> PAGE_SHIFT;})
-#define virt_to_machine(virt)          ({__pa(virt);}) // for tpmfront.c
+#define mfn_to_pfn(mfn)                        (mfn)
+#define mfn_to_virt(mfn)               (__va((mfn) << PAGE_SHIFT))
+#define pfn_to_mfn(pfn)                        (pfn)
+#define virt_to_mfn(virt)              (__pa(virt) >> PAGE_SHIFT)
+#define virt_to_machine(virt)          __pa(virt) // for tpmfront.c
 
 #endif /* CONFIG_XEN_IA64_DOM0_VP */
 #endif /* CONFIG_XEN */